Merge from emacs-24
authorChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:35:14 +0000 (08:35 +0800)
committerChong Yidong <cyd@gnu.org>
Fri, 2 Nov 2012 00:35:14 +0000 (08:35 +0800)
commit4b59fa745abe66f17231fa95d51b48a06025d7f2
tree3754765391985efbe3fdffd32cc8f443e11078f3
parent446322045ad9be99c95f40d3e4c0fa43c5fd19a2
parent1d0789e319309b4f67e3b7a5124ea4fbaf6f9eed
Merge from emacs-24